Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Show a warning in the merge dialog when authors are the same but formatted differently #9088

Merged
merged 12 commits into from
Sep 2, 2022
Merged

Show a warning in the merge dialog when authors are the same but formatted differently #9088

merged 12 commits into from
Sep 2, 2022

Conversation

HoussemNasri
Copy link
Member

@HoussemNasri HoussemNasri commented Aug 23, 2022 •
edited
Loading

Fixes #8745

Tasks

  • Show a warning message next to the authors field to warn users when the authors are the same but formatted differently.
  • Hide diffs when authors are the same (REQUIRED)
  • Add an "intention action bulb" and an action to normalize the authors field, Just like IntelliJ (OPTIONAL).

image

Screenshots

image

  • Change in CHANGELOG.md described in a way that is understandable for the average user (if applicable)
  • Tests created for changes (if applicable)
  • Manually tested changed features in running JabRef (always required)
  • Screenshots added in PR description (for UI changes)
  • Checked developer's documentation: Is the information available and up to date? If not, I outlined it in this pull request.
  • Checked documentation: Is the information available and up to date? If not, I created an issue at https://github.com/JabRef/user-documentation/issues or, even better, I submitted a pull request to the documentation repository.

@HoussemNasri HoussemNasri changed the title Show a warning in the merge dialog when the authors are the same but formatted differently Show a warning in the merge dialog when authors are the same but formatted differently Aug 23, 2022
@HoussemNasri HoussemNasri added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Aug 31, 2022
@Siedlerchr Siedlerchr requested a review from calixtus September 1, 2022 18:55
@Siedlerchr Siedlerchr merged commit 7239503 into JabRef:main Sep 2, 2022
Siedlerchr added a commit that referenced this pull request Sep 2, 2022
@Siedlerchr
Merge remote-tracking branch 'upstream/main' into dbsync
bf51775 
* upstream/main: (387 commits)
  Show a warning in the merge dialog when authors are the same but formatted differently (#9088)
  Fix subdatabase from aux on cli (#9117)
  Visual improvements to LinkedFilesEditor (#9114)
  SLR Remove "last-search-date" (#9116)
  Hide diffs when one of the field values is blank a.k.a no conflict (#9110)
  Squashed 'buildres/csl/csl-locales/' changes from e637746677..b2afeb4d87
  Squashed 'buildres/csl/csl-styles/' changes from c750b6e..8d69f16
  Fix title case capitalization after en-dash characters (#9102)
  Update journal abbrev list (#9109)
  Fix CSL rendering in case of article (#8607)
  [WIP][GSOC22] - C - Improve the external changes resolver dialog (#9021)
  Bump jsoup from 1.15.1 to 1.15.3 (#9103)
  Bump checkstyle from 10.3.2 to 10.3.3 (#9104)
  Bump postgresql from 42.4.2 to 42.5.0 (#9105)
  Bump unirest-java from 3.13.10 to 3.13.11 (#9106)
  Include check for TimeStamp (#9089)
  Close OO connection on JabRef exit (#9076)
  Bump slf4j-tinylog from 2.4.1 to 2.5.0 (#9085)
  Bump bcprov-jdk18on from 1.71 to 1.71.1 (#9079)
  Bump tinylog-impl from 2.4.1 to 2.5.0 (#9086)
  ...

# Conflicts:
#	src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
#	src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java
#	src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java
@HoussemNasri HoussemNasri mentioned this pull request Sep 3, 2022
Merged
6 tasks
Siedlerchr added a commit that referenced this pull request Sep 3, 2022
@Siedlerchr
Merge branch 'linkedFilesfixesRelative' of github.com:JabRef/jabref i…
86e7eff 
…nto linkedFilesfixesRelative

* 'linkedFilesfixesRelative' of github.com:JabRef/jabref: (52 commits)
  Enable files/files
  Don't show the info button when the authors field content is identical (#9128)
  "study.yml" is static now (#9125)
  fix l10n
  Compile fix
  Fix parsing of JabRef v5.7 study.yml files (#9124)
  Fix integrity check  for tilde accents in author names (#9097)
  Rework the Define study parameters dialog (#9123)
  Fix parsing of save actions (#9122)
  Fix exception that occurs when saving name formatters (#9121)
  Refine code for BibEntry#replaceDownloadedFile (#9118)
  Show a warning in the merge dialog when authors are the same but formatted differently (#9088)
  Fix subdatabase from aux on cli (#9117)
  Visual improvements to LinkedFilesEditor (#9114)
  SLR Remove "last-search-date" (#9116)
  Hide diffs when one of the field values is blank a.k.a no conflict (#9110)
  Squashed 'buildres/csl/csl-locales/' changes from e637746677..b2afeb4d87
  Squashed 'buildres/csl/csl-styles/' changes from c750b6e..8d69f16
  Fix title case capitalization after en-dash characters (#9102)
  Update journal abbrev list (#9109)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ThiloteE ThiloteE ThiloteE left review comments

@koppor koppor koppor left review comments

@Siedlerchr Siedlerchr Siedlerchr approved these changes

@calixtus calixtus Awaiting requested review from calixtus

Assignees
No one assigned
Labels
duplicateFinder import status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Correctly understand DOI author fields on import ("[name], [first name]" vs. "[first name] [name]")
4 participants
@HoussemNasri @Siedlerchr @koppor @ThiloteE